Merge upstream 1.3.3
authorJohn Goerzen <jgoerzen@complete.org>
Fri, 1 Jun 2007 16:15:23 +0000 (11:15 -0500)
committerJohn Goerzen <jgoerzen@complete.org>
Fri, 1 Jun 2007 16:15:23 +0000 (11:15 -0500)

Trivial merge